merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 26 Dec 2011 03:35:18 +0000 (12:35 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 26 Dec 2011 03:35:18 +0000 (12:35 +0900)
commit58a52d56b900919dcdca50c3dd9a8efc1c3f5c95
treed5debef047d446e8dda2d64dbb2c0280b1890124
parenta345da726cb82fb8b8133cd0c43183e3680ea92e
parent0bd650c0313aebff2c8fd22593063bd3bf2276d7
merge trunk